From: Jonas Dreßler <verdre@v0yd.nl>
Date: Fri, 18 Feb 2022 13:26:23 +0000 (+0100)
Subject: dateMenu: Get interval for the right timezone
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~516^2^2~68
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6c5a8d4adaa96d86c91db1eb9bd68384988ec70b;p=gnome-shell.git

dateMenu: Get interval for the right timezone

We're calling get_interval on tzA right now for both the tzA and tzB,
this causes a critical error during shell startup:

g_time_zone_get_offset: assertion 'interval_valid (tz, (guint)interval)' failed

Fix this and use tzB to get the offset for timezone b.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2195>
---

diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js
index 42cc192df..8ed1a579b 100644
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -379,7 +379,7 @@ class WorldClocksSection extends St.Button {
             const tzA = a.location.get_timezone();
             const tzB = b.location.get_timezone();
             const intA = tzA.find_interval(GLib.TimeType.STANDARD, unixtime);
-            const intB = tzA.find_interval(GLib.TimeType.STANDARD, unixtime);
+            const intB = tzB.find_interval(GLib.TimeType.STANDARD, unixtime);
             return tzA.get_offset(intA) - tzB.get_offset(intB);
         });